From c024ad0b958497a51f13b4b604f7f5205147f363 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 23 Feb 2001 10:20:27 +0000 Subject: [PATCH] (frame-notice-user-settings): Only adjust frame height for no tool-bar case if tool-bar was originally switched on. --- lisp/frame.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/frame.el b/lisp/frame.el index 3def9a94ae3..c05347c2d4b 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -292,11 +292,12 @@ React to settings of `default-frame-alist', `initial-frame-alist' there." (when (display-graphic-p) (let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist) (assq 'tool-bar-lines default-frame-alist)))) - (when (or (null tool-bar-lines) - (null (cdr tool-bar-lines)) - (eq 0 (cdr tool-bar-lines))) + (when (and tool-bar-originally-present + (or (null tool-bar-lines) + (null (cdr tool-bar-lines)) + (eq 0 (cdr tool-bar-lines)))) (let* ((char-height (frame-char-height frame-initial-frame)) - (image-height 24) + (image-height tool-bar-images-pixel-height) (margin (cond ((and (consp tool-bar-button-margin) (integerp (cdr tool-bar-button-margin)) (> tool-bar-button-margin 0)) -- 2.30.2